From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 25 Jun 2025 17:49:01 +0000 (+0200)
Subject: tools/toolbox: Stop forcing wayland display
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~124^2^2~21
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7fd33d24618585566906494ddeff0e213767abb7;p=gnome-shell.git

tools/toolbox: Stop forcing wayland display

Mutter now updates the activation environment itself when running
outside a gnome-shell session.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3775>
---

diff --git a/tools/toolbox/run-gnome-shell.sh b/tools/toolbox/run-gnome-shell.sh
index a74c41eb4..13ac238de 100755
--- a/tools/toolbox/run-gnome-shell.sh
+++ b/tools/toolbox/run-gnome-shell.sh
@@ -162,11 +162,9 @@ while true; do
   esac
 done
 
-FORCE_DISPLAY=1
 if should_run_nested; then
   if has_devkit; then
     SHELL_ARGS+=( --devkit )
-    FORCE_DISPLAY=0
   elif has_nested; then
     SHELL_ARGS+=( --nested )
   else
@@ -176,11 +174,5 @@ else
   SHELL_ARGS+=( --wayland )
 fi
 
-if [ $FORCE_DISPLAY -gt 0 ]; then
-  display=toolbox-wayland-$RANDOM
-  SHELL_ENV+=(WAYLAND_DISPLAY=$display)
-  SHELL_ARGS+=(--wayland-display=$display)
-fi
-
 toolbox --container $TOOLBOX run \
   env "${SHELL_ENV[@]}" dbus-run-session $GDB gnome-shell "${SHELL_ARGS[@]}"